Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

BTreeMap: more refactoring around edges #77244

Merged
merged 2 commits into from
Oct 21, 2020
Merged

BTreeMap: more refactoring around edges #77244

merged 2 commits into from
Oct 21, 2020

Conversation

ssomers
Copy link
Contributor

@ssomers ssomers commented Sep 26, 2020 •
edited
Loading

Continuation of #77005.

r? @Mark-Simulacrum

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 26, 2020
@ssomers ssomers force-pushed the btree_love_the_leaf_edge branch from 2afa818 to 1d4ac34 Compare September 30, 2020 11:18
@ssomers
Copy link
Contributor Author

ssomers commented Sep 30, 2020

Avoided an unsafe block with Unique::from

Mark-Simulacrum
Mark-Simulacrum reviewed Sep 30, 2020
View reviewed changes
Copy link
Member

@Mark-Simulacrum Mark-Simulacrum left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I left a couple comments, but maybe I need to sit down for longer with these PRs -- I am still feeling like I am not seeing a clear picture of where they are going. I will try to allocate some time to do so, but unfortunately it might be a week or so at least.

library/alloc/src/collections/btree/node.rs Outdated Show resolved Hide resolved
library/alloc/src/collections/btree/node.rs Outdated Show resolved Hide resolved
@ssomers ssomers force-pushed the btree_love_the_leaf_edge branch from 1d4ac34 to 0215c56 Compare October 1, 2020 10:24
@ssomers
Copy link
Contributor Author

ssomers commented Oct 1, 2020

Chipped off two commits to focus on the first commit for now.

@ssomers ssomers mentioned this pull request Oct 2, 2020
Merged
@ssomers ssomers marked this pull request as draft October 2, 2020 23:11
@Mark-Simulacrum Mark-Simulacrum added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 4, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Oct 5, 2020
@Dylan-DPC
Rollup merge of rust-lang#77471 - ssomers:btree_cleanup_3, r=Mark-Sim…
23b1e3d 
…ulacrum

BTreeMap: refactoring around edges, missed spots

Tweaks from rust-lang#77244 (and more) that are really inconsistencies in rust-lang#77005.

r? @Mark-Simulacrum
@ssomers ssomers force-pushed the btree_love_the_leaf_edge branch from 0215c56 to c6093ec Compare October 6, 2020 19:23
@ssomers ssomers marked this pull request as ready for review October 6, 2020 19:27
@ssomers ssomers force-pushed the btree_love_the_leaf_edge branch from c6093ec to b4ff3cd Compare October 15, 2020 11:53
@ssomers
Copy link
Contributor Author

ssomers commented Oct 16, 2020

@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 16, 2020
@ssomers ssomers force-pushed the btree_love_the_leaf_edge branch from b4ff3cd to bc5447e Compare October 19, 2020 09:27
@ssomers ssomers mentioned this pull request Oct 19, 2020
Merged
@Mark-Simulacrum Mark-Simulacrum added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 19, 2020
@ssomers ssomers force-pushed the btree_love_the_leaf_edge branch from bc5447e to 55ff406 Compare October 20, 2020 12:56
@ssomers ssomers force-pushed the btree_love_the_leaf_edge branch from 55ff406 to 76c466a Compare October 20, 2020 13:14
@Mark-Simulacrum
Copy link
Member

Okay, I think this is better. Thanks!

@bors r+ rollup=never

@bors
Copy link
Contributor

bors commented Oct 20, 2020

📌 Commit 76c466a has been approved by Mark-Simulacrum

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 20, 2020
@ssomers ssomers mentioned this pull request Oct 20, 2020
Closed
@bors
Copy link
Contributor

bors commented Oct 20, 2020

⌛ Testing commit 76c466a with merge f965120...

@bors
Copy link
Contributor

bors commented Oct 21, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: Mark-Simulacrum
Pushing f965120 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 21, 2020
@bors bors merged commit f965120 into rust-lang:master Oct 21, 2020
@rustbot rustbot added this to the 1.49.0 milestone Oct 21, 2020
@bors bors mentioned this pull request Oct 21, 2020
Closed
@ssomers ssomers deleted the btree_love_the_leaf_edge branch October 21, 2020 08:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mark-Simulacrum Mark-Simulacrum Mark-Simulacrum left review comments

Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.49.0
Development

Successfully merging this pull request may close these issues.
5 participants
@ssomers @Mark-Simulacrum @bors @rust-highfive @rustbot